changing all datatypes to entry to simplify the model and hopefully make it more flexible
Todo: Custom associations
Merge branch 'simplify' of https://github.com/bencorman/skel into simplify