diff --git a/sys-apps/pentoo-etc-portage/Manifest b/sys-apps/pentoo-etc-portage/Manifest
index 00e7a1865..1df3bd929 100644
--- a/sys-apps/pentoo-etc-portage/Manifest
+++ b/sys-apps/pentoo-etc-portage/Manifest
@@ -1 +1 @@
-EBUILD pentoo-etc-portage-9999.ebuild 1878 RMD160 e34f437d3851626c0dd2d2fa9d46f37d9bbc5a79 SHA1 570542c6efe65bc502a7dce695fff1e3878c2c11 SHA256 5009211d0e596435e9eb2f0e5ddfbaf88b7c65d23eb5bf9856dcce37c97f7688
+EBUILD pentoo-etc-portage-9999.ebuild 1951 RMD160 e8905b36b272494bb50a0dc8fbf231cc62feec9f SHA1 6de2a738366537f4586c47efd27376d905e447da SHA256 c27cb2c75127b08a397e9e056d3f054fc202e55a47e9cc40264c12ae1ea8658a
diff --git a/sys-apps/pentoo-etc-portage/pentoo-etc-portage-9999.ebuild b/sys-apps/pentoo-etc-portage/pentoo-etc-portage-9999.ebuild
index a43bae341..0a37d1773 100644
--- a/sys-apps/pentoo-etc-portage/pentoo-etc-portage-9999.ebuild
+++ b/sys-apps/pentoo-etc-portage/pentoo-etc-portage-9999.ebuild
@@ -30,24 +30,28 @@ src_install() {
 		insinto /etc/portage/
 		doins -r "${S}"/* || die "/etc/portage failed!"
 	fi
-	#run the checks here, leave variable set for what needs to go bye bye
-	#if [ ! -e "${ROOT}"/etc/portage/package.keywords ]
-	#	if [ -e "${ROOT}"/etc/portage/package.keywords ]; then 
-	#if [ ! -e "${ROOT}"/etc/portage/package.keywords/user-keywords ]; then
-	#	cp "${FILESDIR}"/user-keywords "${ROOT}"/etc/portage/package.keywords/user-keywords || die "Copy failed, blame Zero"
-	#fi
+
+	for i in keywords use mask unmask; do
+		if [ -e "${ROOT}"/etc/portage/package.$i ]; then
+			if [ -f "${ROOT}"/etc/portage/package.$i ]; then 
+				cp "${ROOT}"/etc/portage/package.$i "${T}"/user-$i
+			elif [ -d "${ROOT}"/etc/portage/package.$i ]; then
+				cp "${FILESDIR}"/user-$i "${D}"/etc/portage/package.$i/user-$i || die "Copy failed, blame Zero"
+			else
+				die "Something went wrong, /etc/portage/package.$i exists but is not file or directory"
+			fi
+		else
+			dodir "${D}"/etc/portage/package.$i
+			cp "${FILESDIR}"/user-$i "${D}"/etc/portage/package.$i/user-$i || die "Copy failed, blame Zero"
+		fi
+	done
 }
 
-#pseudo code for checks
-# if exist /etc/portage/example
-	# if exist /etc/portage/example is file then copy to $T and put in new dir format
-		# elif exist /etc/portage/example is dir
-			# if ! exist /etc/portage/example/user-example then go for it
-		# else break?
-#else go for it
-
-
 pkg_preinst() {
-#run checks in src_install, leave stubs for files that need to be deleted here
-	echo "ur a failure"
+	for i in keywords use mask unmask; do
+		if [ -f "${T}"/user-$i ]; then
+			cp "${T}"/user-$i /etc/portage/package.$i/user-$i
+			echo "/etc/portage/package.$i has been moved to /etc/portage/package.$i/user-$i"
+		fi
+	done
 }