Added toolkit class, continued development on UI