Added additional functionality, rewrote components, deleted useless things, added queries