Made further changes to the scheme, hopefuly it will start to take form soon