Now we're getting somewhere
Removed some cruft
Yee haw