Rewrite of project

- tracking test not quite working yet. Must figure out why in the morning.