Refactoring

Refactored to make things a bit more concise and pulled out some hard
coded values into variables. Made some TODOs to implement some
necessary capabilities to make this thing work with real data.