Cleaned up code, added stub for compute driver