basically done, do some minor bug fixing maybe
Commenting, cleaning up files, minor debugging