Initial commit after moving stuff from garchive

REALLY need to test this now