Work in Progress... trying to future proof database. Feel free to test though.