marked out artifact code
Gutted more stuff, made assignments expressions