Adds more of the finishing touches for crud and stuff