Code complete, to hook up with simulator now