Fixed and moved from ArchPWN. Had to add new source and fix build.