Fixed all the things

Still need to do the layout xml tags and post/get jazz.