Added functionality

And totally borked it.