New Copy

Created entirely new framework as Eclipse hates me...