Refactored a little:)
Updates and fixes.
Initial version working.