Patched a bug
Started work on solving