added blocks. added more framework for future stuff