Initial Mostly Working

Still not safe guarded, need to do some more work with hooks