Potential working commit of project... TODO more testing