Working! Version 0.1
merged John's code