Made code runnable again, interim commit