intermediary commit, got some shit done
Regex matching for field-types
cleanup