Commit 18 - 2:30

Another, small update
commit 19 - 2:45

Added some stuff, working on getting the bottle to render right