Revert "Working on #6"

This reverts commit fbab101c947d08121d3c6d240d0882f5a4a55eae.