Started work on getting system defined
Completed stream builder tests