Tons of unresolved issues

Fixed some of the issues. Trying to think of a more elegant way to
implement the trading functionality, have some ideas