I've done things, going to convert to scala at this early stage for easier management of code