0.4.0

Major rewrite to allow for map functionality