Implemented correct functionality, better UI to come.