Updated Makefile
Added initial work on cpu
Clean up