More CRUD additions

Struggled getting things in their right place initially, files are a
bit of a mess, lots of redundancies, I plan to shore that up after I
get it to work.