Added Device obj, building out simulation in progress
minor comment change