Quick Update

So, a quick update, added some helpers and moved some code about.