Finished up basic app