Took care of issue#35

Warning:Did you close the migration-fixup branch? Autocomplete bullshit will come along with this.