Done with initial part. Still need to actually run tests