Still working on fixing major bugs and concerns