Code refactored, starting net coding