More updates

Main working. Issues with displaying