updating from @chriso

Been a while since I updated and have some issues to work out