Cleaned up boilerplate for what we need now