Further devel

Have fun!
Yeah I'm gonna merge several config files together once I get things settled a bit and work in the database