More features

Still a few bugs floating around