Makefile and rebuilt with better names an shitt