Did something to Query.hs, Removed Draw.hs