remembered to commit... things are almost working sort of... just a few issues atm