Tried to get fragments working

There were a few things that should have changed anyway, otherwise the
other stuff is still broken