unfinished dev
added things and moved things around
dev
fixed 404
merge fix (I hope)