Day 2

Cleans up code to try and reduce processing steps. Still looking for a
final product.