More Features

Still not quite done yet