New structure, added some functions, preparing to send to Padraigs repository