Started splitting things into easier to read items