Cleaned up WIP

Things now actually run