Made the code a bit nicer, added two projects