- Cleanup this really ugly Makefile
- Testing
