massive additions - some bug fixes and super needed refactor coming up