Updated buggy 'first-pass' methods
Add some basic __main__ output