Added the databaser, removed some of the parse initialization
Merged conflicts