Various changes to code that actually makes it runnable
Various changes to code that actually makes it runnable