messed stuff up
Revert "messed stuff up"

This reverts commit bfeaefce29c072b7db7ad8e0c74b7183ca68e8ba.
messed up 2
Revert "messed up 2"

This reverts commit a218c10f1f370a41f026672eeb3121be39b8c3bf.
minor changes
Getting bizarre StackOverflow error from eclipse

Time to call it a night