Re-adding code again. Hope this fixes our missing classes issue.