Compiled and tested #252

Gulped and complete