Final changes and things complete. Next commit should be completed plugin :3