Cleaned up and added stubs for tomorrow