Release 3

Still a WIP, but it's getting there ;)