Added more stuff on initialization (still rudimentary)
2 files changed