MidtermV1.0

Successful build, minor changes, currently functioning.