06: another attempt, removed unneeded functions, cleaned up init