Fixing momnop's issues
Initial commit