6th Commit

Still having floating problems....