Updated to version 0.5.5 also restructed the app for better abstraction