No more compilation errors, first attempt at port